src/main/java/common/model · b6cacf5a62800b105cecd88bfdaf1959af37dfd6 · reyun / manager · GitLab

History Find file

Merge remote-tracking branch 'remotes/origin/20180525_adi' into 20180530_bpu · 31830e55

authored Jun 06, 2018

* remotes/origin/20180525_adi:
  adi
  adi

# Conflicts:
#	.idea/workspace.xml
#	src/main/java/common/service/impl/ContractServiceImpl.java

31830e55

Name	Last commit	Last update
..
Account4Web.java		Loading commit data...
AppCategory.java		Loading commit data...
AppInfo.java		Loading commit data...
Auth.java		Loading commit data...
BPUContract.java		Loading commit data...
BackVisit.java		Loading commit data...
City.java		Loading commit data...
Code.java		Loading commit data...
Contract.java		Loading commit data...
ContractBody.java		Loading commit data...
ContractChange.java		Loading commit data...
ContractIncrement.java		Loading commit data...
ContractMoney.java		Loading commit data...
Email.java		Loading commit data...
IOAccount4Web.java		Loading commit data...
KeyValue.java		Loading commit data...
Menu.java		Loading commit data...
Notice.java		Loading commit data...
Payment.java		Loading commit data...
PressMoney.java		Loading commit data...
PriceLevelMoney.java		Loading commit data...
Reminder.java		Loading commit data...
ReminderLevel.java		Loading commit data...
Role.java		Loading commit data...
RoleType.java		Loading commit data...
SaleAuth.java		Loading commit data...
TrackAccount4Web.java		Loading commit data...
User.java		Loading commit data...
UserLog.java		Loading commit data...