• eddie.woo's avatar
    Merge remote-tracking branch 'remotes/origin/dev_eddie' into dev · f5390c49
    eddie.woo authored
    # Conflicts:
    #	atms-api/etc/generator/generatorConfig.xml
    #	atms-api/src/main/java/pwc/taxtech/atms/controller/ServiceTypeController.java
    #	atms-web/src/main/webapp/app/adminApp.js
    #	atms-web/src/main/webapp/app/adminModule.js
    #	atms-web/src/main/webapp/bundles/adminApp.js
    #	atms-web/src/main/webapp/bundles/systemConfiguration.js
    #	atms-web/src/main/webapp/bundles/systemConfiguration.less
    f5390c49
Name
Last commit
Last update
..
adminHomePage.json Loading commit data...
app.json Loading commit data...
basicData.json Loading commit data...
cit.json Loading commit data...
infrastructure.json Loading commit data...
noPermissionPage.json Loading commit data...
role.json Loading commit data...
systemConfiguration.json Loading commit data...
vat.json Loading commit data...